Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 26 Jul 2010 01:23:49 +0000 (01:23 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 26 Jul 2010 01:23:49 +0000 (01:23 +0000)
commit432d7be318bfb70a7bd38f14ba697caedfcf5ae6
tree2a786711f57deadda7aeecba3d7da2ad0f997e94
parentca632d08bb325e9ea9cec6386d93a935794e34c0
parent24d97be4b3aba9b06f4a334ac4816a39e27aea44
Merge from mainline.